* merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 87da4f7e26bfbf37eb73a820e7e7d8ae59284ff8..5eeec00cbdb0cb5f1d4d4db76beec1dba9471e5f 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * merge-gnulib: Defer to autogen.sh for ACLOCAL_PATH computation.
+
 2014-05-12  Glenn Morris  <rgm@gnu.org>
 
        * find-gc.el: Move here from ../lisp/emacs-lisp.

diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 6c0dffb6dcee7aff575d6f360dda9885a8114b05..b93d12fbd208d4374fce2d591ac148623d533227 100755 (executable)
--- a/admin/merge-gnulib
+++ b/admin/merge-gnulib
@@ -96,4 +96,5 @@ rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \
       "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
 cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
-autoreconf -i -I m4 -- ${src:+"$src"}
+{ test -z "$src" || cd "$src"; } &&
+./autogen.sh